meson: gtk: don't overwrite top-level cdata variable with local stuff
authorTim-Philipp Müller <tim@centricular.com>
Wed, 22 Mar 2017 16:51:39 +0000 (16:51 +0000)
committerEmmanuele Bassi <ebassi@gnome.org>
Wed, 3 May 2017 14:10:55 +0000 (15:10 +0100)
We need to set the global configuration data written into
config.h from the modules/printbackends meson file.

gtk/meson.build

index 6bdf79912c1c745fba39d224cc288a62e57912f0..1b0cb531256956cd7cd035a1d772d0958e20da16 100644 (file)
@@ -741,17 +741,17 @@ typefuncs = custom_target('gtktypefuncs.inc',
   install: false,
 )
 
-cdata = configuration_data()
-cdata.set('GTK_MAJOR_VERSION', gtk_major_version)
-cdata.set('GTK_MINOR_VERSION', gtk_minor_version)
-cdata.set('GTK_MICRO_VERSION', gtk_micro_version)
-cdata.set('GTK_BINARY_AGE', gtk_binary_age)
-cdata.set('GTK_INTERFACE_AGE', gtk_interface_age)
+gtkversion_cdata = configuration_data()
+gtkversion_cdata.set('GTK_MAJOR_VERSION', gtk_major_version)
+gtkversion_cdata.set('GTK_MINOR_VERSION', gtk_minor_version)
+gtkversion_cdata.set('GTK_MICRO_VERSION', gtk_micro_version)
+gtkversion_cdata.set('GTK_BINARY_AGE', gtk_binary_age)
+gtkversion_cdata.set('GTK_INTERFACE_AGE', gtk_interface_age)
 
 gtkversion = configure_file(
   input  : 'gtkversion.h.in',
   output : 'gtkversion.h',
-  configuration: cdata,
+  configuration: gtkversion_cdata,
   install_dir: 'include/gtk-4.0/gtk/'
 )